From: Daniel Kiper <daniel.kiper@oracle.com>
Date: Tue, 3 Feb 2015 10:31:27 +0000 (+0100)
Subject: x86/boot/reloc: mask out MBI_BOOTDEV from mbi flags
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3798
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1663bdbe1a3e5fe41c898a67c6ac4d30730d8394;p=xen.git

x86/boot/reloc: mask out MBI_BOOTDEV from mbi flags

..because it is ignored by Xen.

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/arch/x86/boot/reloc.c b/xen/arch/x86/boot/reloc.c
index f9719205a4..63045c0c5b 100644
--- a/xen/arch/x86/boot/reloc.c
+++ b/xen/arch/x86/boot/reloc.c
@@ -90,7 +90,6 @@ multiboot_info_t *reloc(multiboot_info_t *mbi_old)
 
     /* Mask features we don't understand or don't relocate. */
     mbi->flags &= (MBI_MEMLIMITS |
-                   MBI_BOOTDEV |
                    MBI_CMDLINE |
                    MBI_MODULES |
                    MBI_MEMMAP |